Revert 36514 per Wikitech-l discussion.