Revert "A better fix for 37f49dc"

This reverts commit 98c01380508b87e43fa9cf13532303d9003b0beb.
refine expand workaround