CDB-164 #comment refixed, removed reverse in place