Revert "Different fixes"

Reverts Zidisha/zidisha2#366