Revert 1950382..b6379a4

This rolls back to commit 1950382c9b4a0d5ae3f0ccc722a391b86c84b8f8.