Revert "Break the build (again)"

This reverts commit d59020ca91b65ba22d292af30fde308c0fa4060e.