Updated for Thievery 1.4. *bump*