Fix rollback to savepoint when timeout is set

Fixes #363