Don't know what I was thinking, sigh. Fixes #2889