Remove temporary monkey patch, PR was accepted.