Revert "first pass"

This reverts commit acbb603c003c1eb9b1d071ef8150865286595370.