Revert "Add some build parameters for Vanir"

This reverts commit f93eda60ccb037ffd15314e0378c06a9be87bc30.