This reverts commit 4ed534758cb6a11df9f49baddecca5a6cdda9311. Backport of bb8f66934d93faf80cd1a2dda65aaedce21a6fc5 from master
This reverts commit 4ed534758cb6a11df9f49baddecca5a6cdda9311. Backport of bb8f66934d93faf80cd1a2dda65aaedce21a6fc5 from master