Address @jlee-r7's comments
Backout small change