Got it, thanks for the clarification. Looks like we're not doing this properly in several places in the project...logged here for a large-scale cleanup: #735.