This reverts commit e6cd5d0b.

The problem was already solved with
af4b6c94.

Change-Id: I21d7ca9fec601377967297bc42835573422c29a7