Revert to Notes 8