Revert 3ef317f..eb42f2f

This rolls back to commit 3ef317fbb268d7b521097d3c8b38c52b33195fe4.