Revert "New experimental normal generation"

This reverts commit f65ddf6d7ceea43139a3e7be75ce281b756d108e.