Revert a358bec..bbef5be

This rolls back to commit a358bec440208bc31420acd5df12c7dada8dfd7f.