Reverting scaffold into 1.8.7