Per discussion, will revisit this after merge