Revert to previous version but keep commented code