Revert to 4212791ae3