Fix rgkit for server. Please keep existing public interfaces consistent.