Put back what was lost and remove duplicates.
Rescue stale element error.
Merge pull request #604 from Tahi-project/fix-merge-shenanigans

Fix master by rearranging mangled methods.