Revert "Fix default EXTRA_FORMULAS logic"

This reverts commit 28e6757cee0a4ead12e008e2e3247616fd6795a3.

Change-Id: I0f19c69c6238edeec543e7534d1c43bf4c1732d8
1 file changed