CAP-1841 - Fixed stupid comment outs