Revert "Got rid of Matt's stupidity"

This reverts commit 6e9d7720410ba2d38738f74f595e796e2d508a15.