Undid my booboo in #617 as it didn't work, should have known better :P