Reverted back to 3.5.1