SVN r493 + extra builds removed