OP-1660 Revert last commit + uncrustify