Remove unnecessary workaround