Revert "debugging after yet more api changes"

This reverts commit 9f3bdd342fe797bedfb936a3e9384b65c155ebc6.
Revert "Revert "debugging after yet more api changes""

This reverts commit 1c67ae653d080ca0ada1977fc12266d056a8370a.
Revert "Revert "Revert "debugging after yet more api changes"""

This reverts commit 5db994ed9844cf9058db817bcd3c533f2eee6794.
Making things work again