Back to proper build