Reverted build config/IDE settings for an easier merge.