Revert "External interface fix"

This reverts commit ed66ccffecdb242fecc7e6f463d8f6f32771f1c1.