Reverted intval removal due to problems while passing parameters

Change-Id: I0aa5d4a3040c49a0d8be88c7ab2928b09f2b828b