Revert 6c3642e..7fd5ed8

This rolls back to commit 6c3642e23e45f3b951b9ba95ecf7bdf2ac6a2453.