Fix warning
Partially reverting 6bddf239ffc70cd3cb5042f188baf8ad364e45b9 to fix issue #571
Another probable BAD commit
Revert "Another probable BAD commit"

This reverts commit e220acf226d8716160265cbf477627e52d6f9e01.