HSHARDS-71 revert to Configuration