Revert to 48b4088122