MT#4225 Revert the revert, we'll patch later.

This reverts commit 2cd76e7b89ce30c8bb9a45267a3b2e99a7fbe485.
MT#4225 Align new schemas to optimized approach.