Revert r271504. A new patch to solve this issue will be made.

Suggested by:	adrian @