Attempt to unbreak builds