Revert 8c478d6..b911730

This rolls back to commit 8c478d6354581f5ad8f1afcdb673f883e904ae8e.