Apply patch for demonization issue (#213 from google code)