Revert 38085fb..d9f74ca

This rolls back to commit 38085fbe6cb3bce96a0d869b72116c5d946d24ec.