Revert "Break compilation for testing"

This reverts commit f360f1f7705b030b41d90689b57d9d42d7157e05.