Remove silly const_cast

Change-Id: Id68ae78b5b4baff9a213710466f1ddce1a497472