Revert 0dfe7e0..1979ec7

This rolls back to commit 0dfe7e03b4b72469e18d4b1a70a14eb651297310.