Revert 00f4de4..28c519d

This rolls back to commit 00f4de45e509412126c8a90f4439f13ef10afd50.