Revert "more cleanup with doolittle"

This reverts commit 65d04e3b89e65ec727767b6d59b9fd5cb071610c.
Revert "cleanup with doolittle"

This reverts commit c9742087807691d8de823564b720d878a28f40e7.
this version works