Revert "Attempt 2 at fixing scrutinizer"

This reverts commit e650c82289d5a85261de2503e7e712f4c84d17e1.