Re-application of change with a mind towards binary compatibility. Signed-off-by: Andrew Purtell <apurtell@apache.org>