Revert abstract class change.
fix conflicts.