Fixed scoreboard being broken in 4x3
Revert "Fixed scoreboard being broken in 4x3"

This reverts commit 3f79406a378fe598d5e668af4279edc1a3a839b3.
Revert "Revert "Fixed scoreboard being broken in 4x3""

This reverts commit 848ca58dd2ba67cfcd9c53a2dfc45121a135e432.