This reverts commit 450cd6c8. Bug 5711 This will be re-reverted in 19.05 with other code changes we didn't feel comfortable dealing with in 18.08.