Rolled back to 3.4.9-SNAPSHOT