Workarounds for the bugs of the day

@toabctl no, I want to fix temprevert.