This pull request resolves #2429; I was also feeling that this is not great dev experience, so we should fix.