Reverting previous fix which is not necessary