merged monkey-patch overrides to 3.3