Remove v0.4 limitation.