Go back to using a switch from configure-aspen