Reverting build format tweak