Back to bug 25519

No changes have been made to this bug yet.