Revert "Hans branch"