In the interests of seeing this merged in this lifetime I hacked it to make it like it was before.