Revert 1c7c606..8713f7d

This rolls back to commit 1c7c606665bb380cf126e10dfe8b0ba930c478e8.