Revert "CP-12513: Respond to review from euanh"
Revert "CP-12513: Respond to review from euanh"

This reverts commit ce8b19bf509541296e2a985762d832ca8ce443ac.

thomassa/xen-api,Frezzle/xen-api,thomassa/xen-api,srowe/xen-api,jjd27/xen-api,euanh/xen-api,rafalmiel/xen-api,rafalmiel/xen-api,euanh/xen-api,jjd27/xen-api,rafalmiel/xen-api,srowe/xen-api,rafalmiel/xen-api,rafalmiel/xen-api,thomassa/xen-api,srowe/xen-api,euanh/xen-api,srowe/xen-api,jjd27/xen-api,Frezzle/xen-api,Frezzle/xen-api,thomassa/xen-api,jjd27/xen-api,rafalmiel/xen-api,euanh/xen-api,jjd27/xen-api,srowe/xen-api,thomassa/xen-api,Frezzle/xen-api,thomassa/xen-api,euanh/xen-api,jjd27/xen-api,euanh/xen-api,Frezzle/xen-api