This commit resolves "Problem 1" described in issue #7771. Signed-off-by: Nathan Gough <thenatog@gmail.com> This closes #4496.