Revert 23dee32a299