Revert ef4cb27..bd2d826

This rolls back to commit ef4cb27b45a0615d92ac01dc6f84a518a0681041.