Reverting part of previous fix since it allowed for false positives