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