I have attached the comment #4 patch here. Please review