Revert "Merge pull request from jrdnbwmn/luke-thomas" This reverts commit 7e3f7ede129b1eca8b12e25f65497bde6cd68803, reversing changes made to 984f7d1788854e0e47730120d7a9429d4c819bdb.