Revert last commit.

Needs further investigation on why this breaks.