Revert c20ac88. Broke tests.

Couldn't figure out why, so reverting for now.