Reintroduce changes for conf/163778

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