Undoing changes that made it past my merge