Revert "adding search21-36 to decom.pp"

This reverts commit e80cca9d73a984e51c9a212da27f49e0e8a3b3ca.

Change-Id: Ib53832ce99ffe4c2cb66a24a141c9f5bff2ee4bc