Finally: restore buttons are working. Closes #42