Remove special casing for Build