Revert 31de2a8..11c9ee4

This rolls back to commit 31de2a86b013c130816b817a9bc66098ed8a20a7.
345