Oh please - why introduce this new class if we know we will throw it away?
Changes in the core repo can be part of this PR - for any other app the devs need to take care.

This is a private class not to be used for months - please let's just kill this with fire.