Revert 8d3299f..193f429

This rolls back to commit 8d3299f070f68a977c66b43cd4a69956c1502716.