Fix [f51efe99a7] by reverting [371bcd0714]