Revert "Merge master into updates"

This reverts commit ba663278be86c78fff130121435e25b5c57b06b7.