This reverts commit 45bb448f.

Since it caused a regression in saving portal_components.
To be re-thought and re-implemented