Revert 2612b46..d5612e5

This rolls back to commit 2612b4699561e6fad040c32e1e3578297c717e1c.