Make two-staged build work.