Revert "Another fix"

This reverts commit d92e681e2d7feded7cbd23a5402f0cacdd549dff.