Revert 9ee7378..7b18b1f

This rolls back to commit 9ee7378395c6a607bc036641fd3b5ae49c16b281.