Revert broken scoring mechanism