Revert "WaE: unused functions"

This needs to be reverted, too.

This reverts commit 734f30484221e091669cfdb45c144084a1377998.