use commenting instead of #if, bug 1027359