Unbreak build and make it slightly faster.