This reverts commit 8548df4138. I suspect this is causing smoke tests to fail. Reverting to confirm.
8548df4138