Reintroduce changes under test for kern/173932

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>