Revert dd08c9204760
Merged bug25713 into stable