Undo accidental commit for build-common.xml