Reverting commit 39addc87a37b32be19f2c58ec8babe752c0243e1 after a report of problems...