Reversing PR #2 for Feathers 1.0