Revert "Fix odd issue where false-positive errors shown"

This reverts commit 39b8ea9e64ff0062e64a3d0f4710b91e6211adfc.