Reverted change that done out of pull-request