Revert 454a870..d2ae7af

This rolls back to commit 454a87026b6a7aef34336f6724549f2a43e53d5d.
ttt