As discussed in IRC, I've reverted bug 1174498. This bug remains valid, however, as a blocker for committing 1174498 again.
As discussed in IRC, I've reverted bug 1174498. This bug remains valid, however, as a blocker for committing 1174498 again.