This reverts commit fe0ca82b23.
This is a design issue, needs more thinking, for now just revert back to old behavior.
This reverts commit fe0ca82b23.
This is a design issue, needs more thinking, for now just revert back to old behavior.