Reverted back EXTRA_FLAGS which was changed unintendedly.