Revert "Fix in last commit"

This reverts commit fabc86320737f8e0606288225c3d71b38895f0c2.