Revert "Update to Master"

This reverts commit b19270d2bf9a2c10845cb8443accc410f8e86ac3.