Backport r375450

Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>