Revert "Scrutinizer Auto-Fixes"

This reverts commit e5ea946dbb8e27f9679fb297b693a547f45a25c4.