Revert "Improved ZC detection"

This reverts commit c59f62b569c55729a7ca97560856791b1b7c716b.