Restoring changes which got accidentally reverted.