revert stuff from 893309b, which we do using tito