Undo MFC of r267960:
This patch cannot be ported as-is to 9-stable.