This needs to be removed. This has been replaced with the class method. Change-Id: I6f3e79b1ba5a3f7a4f320495f8df9f053bfd78f9