Revert last three commits. I totally broke autoblock and didn't notice somehow. :|