Reverted assemble#0.6.0 change