Keep old defines for now. Reverts last commit