Revert "until I find something better"

This reverts commit ea9fad84655c8192f9fca162defd8b4cb010b218.