Updated following regression back to 1.7.1-SNAPSHOT.