Revert "Updates for revert"

This reverts commit 6aa5c0357c2efe12cf0a5c3d7bf5d5abd03744a8.