Should probably revert this as the [code sniffer](https://travis-ci.org/cakephp/cakephp/jobs/19340889#L85) doesn't like it :(