This partially reverts commit 9bd032a6, see wrspec.v2.06-07-2011, page 28
Signed-off-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>