[#858] cleanup oops commit from [#1413]