Workaround the stupid maruku bug, take 2.