Reverting the commit dff5399e to fix regression. And fixes the issue which was originally aimed to be solved.
cc: @meh