Revert fix for #18 for now.