Revert a small part of the last commit

It seems to be causing a problem on Morph.