Merge "Remove the EXTRA_FANCY_FEATURES flag..."