Revert to 4c4986d471e