Merge "Remove non-420 configure option."