Revert "Add generic maps queries to skip."

This reverts commit a024d95c6d126fd2bf4af139f515a66700213c6a.