This fixes #8043.  The controls now all work.