It now returns the current setup if nothing is being set.  This fixes #7504.