Revert cebeb0a..c602e68

This rolls back to commit cebeb0a1f2c5148812034a99a2178c1ab02e4b87.