Revert "Broken."

This reverts commit 286aee79684904cdc093989fe2aebb0944ac0242.