Revert "misc-fix: separate skip and has_no_coeffs"

This reverts commit e80b96e04ca4691f56dc0bfb6404b090f90aca21.

Change-Id: I9c0b41092700ceb41515ad8dece4773a12a6dc33
3 files changed