Revert cac9b6a..86493b7

This rolls back to commit cac9b6ab364a7e1a20461f2cf4171ced6a988ae0.