Revert be43993..d69867f

This rolls back to commit be43993a39633df03ed9d0242041ef5df191abb9.