This reverts commit 32dfa1d0. In the meantime this was fixed in https://github.com/paritytech/substrate/pull/1667.