Reverted changes for NYCCHKBK-3657