Revert "Merge pull request #224 from unikent/feature/change-delete"

This reverts commit 61a93a4d3955407e64cf0bb6386d46b587c45bfb, reversing
changes made to 4327e831c7ebe0dd9ff8c2c90678fda77219a500.