Restore the commit 0de8ebf by Carl Eugen Hoyos that was lost during the merge 58257ea.
0de8ebf
58257ea