Revert 3.0 changes. Closes #24