Revert "Eliminate this until we decide if we will add back"

This reverts commit 4df8a6b225dab03d0718ee0a5559915a2d2c1028.