Rollback to 2.3.1 spoon's version