I don't think we're going to need this in the client again. Change-Id: Id38405c14edfd7ac45afad8f32cad64594ae7bc0