revert the MFC r314085
Sorry, I generated a wrong commit log for r314085 due to a copy&pasate mistake. Let me revert it and I'll redo the MFC.