Revert "First pass"

This reverts commit 169df067ad556fa486df2f11d6aec79b1f3a2a6f.