remove more patching

Change-Id: I6093fdf6992224dda01bc9c7c8aefe6b29398497