Revert to 41b761f97395.