Revert "Fix for generic renaming error"

This reverts commit f9f661547f986c50280797ab29a4e3d8aa213191.