Revert "Merge branch 'score' into develop"

This reverts commit 6d33634c732ac55a4d6f86c285c43f6fcf1645fd, reversing
changes made to 298e044f37cd63eab4dd0e89660e16e9a5a0fb5d.