Revert "Cleanup"
This reverts commit 17779ca59bb6a170443a8beaec6738c286e9186f.
That's actually used from qml.