Revert "Merge branch 'master' into curationFix1"

This reverts commit 91cc60c881cbcb64c2d9f30cc34313b8a20900b7, reversing
changes made to d2ba46efba9e5c74b1f656a8cd19b0feb65c1909.