Revert the backout of bug 938023 (changesets 19fbd3fb0373:8146150d4df8)