Reverting an accidental merge