Reverting DAR-2396 - no longer needed