Uncommented patch. Waiting for fix.