WA to make contact conditions work again
Revert "WA to make contact conditions work again"

This reverts commit dc38b4143c190ddc1cc5336a877d010836495082.