Bug 905208 - Following Julien's tips