Revert "LINT fixes"

This reverts commit 71f79cf676885063d99fdcfd2a9dcc78bcd39769.
Revert "Merge remote-tracking branch 'upstream/develop' into bob-develop"

This reverts commit 2a5f8b480704d51800e63b4bda5c53fc2190d5a1, reversing
changes made to 88b16e9caed60710ca756af84780e5ce481dc90c.
Revert "Bobs updates…"

This reverts commit 88b16e9caed60710ca756af84780e5ce481dc90c.