Revert "Breaking the build"

This reverts commit b012ab019ac3e22eaf0051e517c04c3671c7b350.