Revert "Latest master merge"

This reverts commit 689cd787c8086d9f49b921f93ed0dc0c1bb19f19.