How were we not doing this before?! (cherry picked from commit 3e2222b01157bbfbbae7fd92ebc7c13f44b0a233)