Reverted some changes which got lost