Revert 5fb3aaa..06d945b

This rolls back to commit 5fb3aaa059a59e7bc8d4935b42b9ed58c0a84ec9.