revert workaround for #29 in favor of key-based solution