Revert "fixed expansion logic >_<"

This reverts commit f9a010ab9dabb811e6afe4bdc5dc71660ee3904d.