Undo bad merge that squashed commit d8350e3f02e49d58652b01389389b037af8960a2