Not using Compass with upstream branch