Revert "Fix setUpWithRecord (as per cloneRecord_test)"

This reverts commit 4b308083ec02e3794d77ca29a23594dfad1010f3.