Partially reverts 0130d0b512 & 4c088c29ea It appears that some sort of WoT is still necessary for me and it may not be as dead as I declared it four months ago.
0130d0b512
4c088c29ea