Revert "3rd pass"

This reverts commit 77227963754b18c206bfea5cbd0bb927167b9227.