Revert abcb2d2..c6d7887

This rolls back to commit abcb2d28bb39a6e249016ed621ff8c6d5f43373c.