Revert 8c97d99..e5d98a5

This rolls back to commit 8c97d995d72c7b077c8f8bb16e2545846040f18c.