Step back from 'use strict' for now to make it easier to merge into master