Revert bdf81de..1a7d54a

This rolls back to commit bdf81de5e823c58d4c58b8d84fd75fd15ceda422.