Yanked and re-pulled in #3177.