Revert 80d8d89..cacfffe

This rolls back to commit 80d8d89c2f23e4763d31ae34270c402d07a97f87.