Revert "Master changes"

This reverts commit a3843efa99cf6a400079a0a254eaa65214319acd.