Revert "Improve flexibility of structure pattern"

This reverts commit e2c00397fdd4667f36f7a768343c3aa571cd200f.