Would appreciate some eyes on this change: https://rbcommons.com/s/twitter/r/3436/