XD-1031 Revert earlier changes in RestConfiguration