Revert "try out \r instead of save/restore"

This reverts commit 9efc6345117975b794e2015650b6096947b2cdb7.