Bug 1051015 - Revert