undo martijn 'fixes'