Revert "Changes in OE to expand nodes"

This reverts commit 8b6ad3a48a68c3533308e411543b4777fd686e04.