Revert 84e8fd0..5ee879a

This rolls back to commit 84e8fd02da39cfb9ac761fb767a843fc100b5581.