Revert 1ab24e4..3e30f30

This rolls back to commit 1ab24e4960ccb034c44587ca3348294d455dde46.
semi-final