Remove 0.9-incompatible monkey-patching