This reverts commit 45bd7b3bd9008941580c100b9fc7361e3ff3ff0d. This is a backport of 8aaf51f94c70e3cfcd2c75a0be1b6f55049d82d8 from master.
This reverts commit 45bd7b3bd9008941580c100b9fc7361e3ff3ff0d. This is a backport of 8aaf51f94c70e3cfcd2c75a0be1b6f55049d82d8 from master.