Revert 35f7a43..3667d45

This rolls back to commit 35f7a43a1870f306b8059d16681df1725681634c.