Revert 210d062..08bae30

This rolls back to commit 210d0621a67ed0470aa870612011fd4b609dfcee.