Reapply 421f730b94b8df1f747951d48ffadcf5e3377cf0

Reported by:	antoine