Revert WIP that does not compile due to dep on the new class.