Revert "[expand] Adds support for variant box"

This reverts commit 52ce484c7f61c5931f6392ba456c31fdabed4a06.