Backing out Gerv's checkin for bug 71840.  Per the bug report, it did not have proper review first, and myk objected to what
got landed on irc.