Revert "7-17"

This reverts commit 08dba68667ea34a4d1c0869c63e3737487417953.