Upstream changes

Fix building by removing a duplicate define