Revert "1122-16-path"

This reverts commit f06936438be57540a17f8d43190d020923ee6baf.