Remove a special-case error_logger invocation
Merge bug26337