Convert SOAP to HNI

Summary: fixes #3949

Reviewed By: @ptarjan

Differential Revision: D1615521