Revert 82241d8..4186c22

This rolls back to commit 82241d88c5ffe92901fb37c1b08b127f24b45a5a.