Revert 2d689ed..8662c8d

This rolls back to commit 2d689edb3bfbcd78d6468f119a3fa58221ded260.