Revert "More REST"

This reverts commit 8dcace23071ed8dc462ab5d3050068ef79da226d.