This reverts commit ef2277ec58. This caused a regression for some apps relying on the old behavior. Bug 9372495
ef2277ec58