Revert d5d8fd7..ff5ff09

This rolls back to commit d5d8fd7d53dc59fbf12b57475ae55c495d21764d.