We should do it the old way (if it works), otherwise people without ordereddict (2.6.x users in particular) will get incorrect meta files.