(#14872) Revert "Merge branch 'mruzicka-ticket/master/14872-PMT-respect-environments'"

This reverts commit 832dc76fe7305e3efebd4220498ad0353fbf8ab8, reversing
changes made to 7490e18b915b50f7ee0204332d5dad20408cc8f1.

This change set appears to have caused an acceptance test failure last
night.  I'm reverting the change, please submit a new pull request once
all of the behavior tests are passing.

The failure may be seen at: http://goo.gl/Vmyu1