Revert back to r15429 (undo commit 15430 on wrong repository)
Authored by: lvoisin 2013-01-11
Parent: [r15430]
Child: [r15432]