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

This reverts commit deca3aeebc5b18e42df8ff75025ef60f46a8e44d, reversing
changes made to b970113aa620937c92921f58641d652ad3d9bbfc.

phetsims/scenery,phetsims/scenery,phetsims/scenery