The merge in f5e30692 messed up the contents of a merged file, this is just reverting the bad changes made there.
