Comment by sschueller

This sure looks like an attempt to move those into this solution.