Switched everything over to ComponentUtils.offerUntilSuccess per @mFranklin's request.