Summary: The behavior introduced with 6852592 is now enabled by the new system property only
Reviewed-by: dcherepanov