removing fix applied by Changeset 4378