This closes #1764. Signed-off-by: Bryan Bende <bbende@apache.org>
Signed-off-by: joewitt <joewitt@apache.org>