Revert "user choice logic"

This reverts commit 13a899ff8228ff4a54f846c86b0716564c155729.