Fixing options, not double logging.

Change-Id: Ib8600081cee8b010136bbf8cf3aa08b1805cc48e