Revert "Merge branch 'zcomploc-support'" This reverts commit 9dad9ebe899b4f2c36923c9721a09ff45b4e573c, reversing changes made to e76bc71efe8c3c724e14a2f741fe4f34669d1bea.