timeo Amplidatos et panna ferentes

This should solve the reopened ARAKOON-403.
Ruben is currently testing the changes on this branch and will let me (Jan) know if all is well.