Committed change not exactly related, just a casualty of the should-have-been-a-simple-merge-and-not-conflicting craziness