Undoing accidental commit (#1114)