Fix for SCI-1774 stop passing in persisted values, create from scratch