Merge "Remove a log message Jason doesn't like" into gingerbread