Revert 3db8341..fe04152

This rolls back to commit 3db8341352bec248cd04020059362030e2390ecb.