Revert "0716"

This reverts commit 487af26aa678524a758ff73197e26fde3f2b4f97.