Update to match @5cadce0e07