pre-1.7.1 downgrade