This reverts commit ca802a885f. Not required anymore since it is fixed with previous commit 3cd3e1e.
ca802a885f
3cd3e1e