Restore f6667d3a6a8e1954c3df4c12aba462670c36eecf

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>