revert logical changes; temporarily block unit test failure over '0' vs 0 distinction