old unnecessary workaround removed