Let's reinstate the name charade instead. Pitäkää tunkkinne.

This reverts commit 59414966.

This reverts commit db231633.

Change-Id: I7d9890f3bd478bac195c1a7a59ff9822c2c83653