Reverted to 3.4.8-SNAPSHOT