Revert to previous revision because of merging problems