Revert to 922663ad050