Revert "wip - schema update builder improvement"

This reverts commit 9442e2bad035735ea587a6b3013bd8248855b967.