Revert "deliberately bad commit" and add some new stuff