Reverted part of the previous fix