* commit '6ee7d25010d4f23b44a151f3953225ba253de8af': Revert "Don't prompt at boot if we already did that when decrypting"