Revert "Multiple choice now has a button wrapping each choice."

This reverts commit 1bcc60685cc7977e7e4fb3ca60cea0d566e6fbcc.