reverting 'all work' to garrett's original version