Revert "Merge branch '160_Base' into v160"

This reverts commit 4757638a0c435db6c1eb8259eb312db537564a3f, reversing
changes made to dc246709a56162fed82249d0146675d157a4c774.