Revert "Metro: add guard to avoid always-false comparison"

This reverts commit 7b1f877df854eaa0cf201b4c348b2477829e7b80.
Metro: be inline with comparison logic