Apparently we may need to initialize the option if it isn't present. Change-Id: I4a9f4f2ace3aeb914feba868e2ac8a86223232be