I'll roll back this one, it causes issues with pyquery, which we can't update now because of https://github.com/gawel/pyquery/issues/6 and https://github.com/gawel/pyquery/issues/40