Revert all changes
Minimal changes for issue 29