Revert a76f170..5f4953b

This rolls back to commit a76f170a6a1bcc8f7e019aa63d2dd2e9a934b73e.