Revert e3f2e82..45a25dc

This rolls back to commit e3f2e82bc3cb51e32dc6c1176708edde57138834.