Remove changes marked with [TemporalilyChanged]

[ewoutkramer]

While working on 6.0, we have left some code in a temporary state, to be able to run the unit tests. In the final version, this code needs to be restored, and the unit tests should work none the less ;-)