Revert 9bb69df..17bcef8

This rolls back to commit 9bb69df77e6a36973baef4aadd4ca7c411761335.