Revert "Diagnostic run, to be reverted"

This reverts commit 11a88da2faf1059192f771c557391087b3cc35e6.