Revert d406ee4..34641a6

This rolls back to commit d406ee469c28e4e862701fed76bc1bcc1e996044.