Back out accidental commit of unrelated patch