Revert "Fixed previous fix"

This reverts commit e8ba7b47fdff2535bf75f32ab77b3eb7b9acdb7d.