Allows for better testability.
Also cleans up some weird code
This reverts commit bcdaee7d39.
bcdaee7d39
This reverts commit 3e2e2a7000, reversing changes made to d94801b6c6.
3e2e2a7000
d94801b6c6
Allows progressing forwards in the interface