Remove unnecessary workaround.