Delegate value loading to existing method to remove duplicate code paths. Original Pull Request: #2785