revert my own revert

sorry, I guess git was being cleverer than me...

This reverts commit a32ae4b848b95f5d33ddfcf837d1610aa8d92b36.