Revert "NG 1.0"

This reverts commit dee7286703d727f859fea0b2d7156f5d4bf14bd8.