Temporarily remove 1.6.4-specific features