Temporary torture test for Heikki's patch