Revert 5c312fb..79c9d4f

This rolls back to commit 5c312fbc1f12cbcd9ee7478e0a66577f5dbe77aa.