revert back the patches for entity module