use existing to avoid deprecation cycle normalize test too (cherry picked from commit 2cbb721f6f)
2cbb721f6f