Merge "Stop using ErrorStrings for apache."