Revert the intrusive part of 55bcf8ff31407233b0c242361f56f165c8e15c57.