Revert "same as last commmit will revisit"

This reverts commit 98aae92427c3dc0e4d90fef7fc4b7b0e6f729f2a.
Revert "Temp fix not the best idea... Need to revisit"

This reverts commit 51652c58fc2e55359e0e2fb169d52ecc707fc003.
Update build flags