Commit b10430b0 got reverted by merge fe92e2df, probably due to a wrong fix to one of the merge conflicts. This commit restores b10430b0 and fix the conflict in the proper way.
