un-rip support

This reverts commit b9e7aeba0ba04953def2676566b1a6427edad773.