Revert ccd7be8..f70bf00

This rolls back to commit ccd7be8044c839c2539f6f21ad700b628794c869.