Revert "Moved pass detection back to where it was previously"

This reverts commit 521d78074e24ab23ff3023c3574fc211f1f9c3f4.