Meant to replace both
!20723 (diffs)
!20726 (diffs)
I kept running into a Lint error, and I think this may fix it
cc @cheriholmes @cgudgenov