Have we filed a bug to fix this workaround once the API is complete? If not, please do so.