Revert "get rid of lazy option"

This reverts commit ecc14cba080c0f78d7947cc463d77165cc9b7269.