Refactored in Rest during archiving.