Bug 1049564. Backout unintentionally landed code.

CLOSED TREE