Clean up #820

As a final note we remove the old behaviour and update the CHANGELOG