Use the acceptable instance holder pattern as a replacement. Change-Id: I0164b8c17db4e6e15aee5a862fa8e625a9b1bbf4