Who served two terms but not consecutively?

Grover Cleveland (1885-1889, 1893-1897)