as it seems to be causing some internal crashes in AA after email with the author. This reverts commit f79e6a88.