Revert Stephen Kelly's changes.

They should really wait until MPL's dependencies have dealt with his
changes.