Re-commit to check build sanity