Revert "SI-6387 Clones accessor before name expansion"

This reverts commit 4e10b2c833fa846c68b81e94a08d867e7de656aa.

Add relevant tests to pending.

Review by @retronym.