Revert "change gpio_match handling"

This reverts commit 136b7419c394291ad79802a75ae80b7871bea796.