This reverts commits * f50bcf617a * 4f184498bc * ab3330564a because they're 3.4.0-compatible while we need 3.3.1.
f50bcf617a
4f184498bc
ab3330564a