Revert "Merge branch 'master' of https://github.com/luksm/cakephp"

This reverts commit d6c5047fbbf7074f7d330636a7794ea75269d848, reversing
changes made to aedb344429f0a56fdb9337e791d6b4f40b22b31a.