Revert some jrd changes