ungradlized shit for the 1.6.4 branch in case more retrofits are needed