Temporary torture test for Heikki's patch
Revert "Temporary torture test for Heikki's patch"

This reverts commit 4208f864177022bbaebdd75cdf8cea0f7e10bc1c.
New syntax