Revert "Correction to expansion types"

This reverts commit e8af96023807769ab3fff272edc3aef4c9947398.