Revert 7f7e8d3..d35b1ea

This rolls back to commit 7f7e8d3ccc2a98e64c57d1dd57472ca3ed81b5c8.