This reverts the previous fix