This reverts commit 914836b1. Further comments on review came up after initial approval. Reverting while addressing.