Readded 1.0.4 changes