This reverts commit 059d1f84. Some tests on green dragon failed as a result of this -- see notes on D96334.