looks like I missed a couple of methods in my earlier conversion

Change-Id: I07871a451bb5954feab57de0af4f7d0678f9a7b3