This is a regression that was introduced with the port to the new approach. (cherry picked from commit db2a8acd)