TC demo workarounds

if we need a deployable version of master right now we're going to have to merge in these reverts.