Remove detail changes

I made some of these changes in my #3184 PR but I *think* that they might be responsible for the crash.

Unfortunately I have no way of debugging or otherwise reproducing the crash so I'm just going to back them out :(

Andy