Hardened against PIL packaging hell