This reverts commit 130654ab.
And commit 6662b884.

Couldn't test successfully on stage, so until I can confirm changes,
backing these out to not block others.