Revert changes causing test failures

This reverts
0008c5fbbab217aa69d00ab83842faaa3bc308c0.
and
ca2eac05f815ad4c70e177d83c05fdfb654f0c37