Revert "Button as checkbox and radio button"

This reverts commit a6945ea55286da40c77a51e75b3c11762ffcc318.