Revert "changes made by Olof"

This reverts commit 09dfcbc8991a240766e61e2bf7903845d6200480.