This should reduce reliance on the default constructor. Introduced by 316d4c9b (cherry-picked from c7ef69f4)