partial revert - that last commit actually broke stuff