Revert "Turn the advanced checkbox into a 3-way selector"

This reverts commit 17b8c5fb814abc957bd473c7ff42950a2d6f5e97.