Commit f980d055a0f858d73d9467bb0b570721bbfcdfb8 causes a regression