Debundle hack - possible terrible