Reverting changes from NYCCHKBK-3707 so it doesn't merge into ddc branch