For ENG-5395, revert change to compaction predicate
Revert "For ENG-5395, fix another constant"

This reverts commit 2a2db34bfebce5a2e3daed0d3aef9563e47d71b4.
Revert "For ENG-5395,  fix test to trigger compactino as desired"

This reverts commit 460f085c4c3592bc5ab9b4811d42312d391627a6.