Revert 247add7..8354191

This rolls back to commit 247add7c2826049705cf05e09656a37c47c8583e.