Revert "Bug 865376 and 484863"

This reverts commit dcc98aecd30449e8f82a16c135e42936e2b91c97.