Fixed and uncommented patch.  Previous patch was incorrect and did not apply cleanly.