Revert d86ee23..fd4ebc5

This rolls back to commit d86ee236d5f6056825edc2ef2fefa67a304d0f2f.