Remove some functionality that breaks hyperexpand
Revert "Remove some functionality that breaks hyperexpand"

This reverts commit d2ee61c88098fd847dba144c8fa8765e77135d47.