Merge "Fix bug 2772728 with the suggested fix.  I wasn't able to reproduce it though." into gingerbread