Revert "Merge remote-tracking branch 'Public/master'"

This reverts commit de1fee30129e32f1b0a58e5aa17fd273557b4326, reversing
changes made to a169b982db94d5c4c91e70abb6f49b08265972ea.