reverting previous patch, Anthony is right, the patch is not backward compatible