Stick with the same hp filter for all paths

Change-Id: I76b82952129c7502f6706c168e630ada8085bd1a