Revert to 4a99534638