This reverts commit e384675d.

This simplification makes it so that the step in question always has
to be run as the first step of the type that sets some Tails Greeter
option, which is pretty confusing.