Revert "Small change for build warnings" - and stupid again

This reverts commit 1885061a732fe42e76bf9eeafbaa1ff166984fc1.