Reverted bad changes in rev 4738c15ab020b8499107bad1518b3a86765b500e