Revert 65355ba..206d9b9

This rolls back to commit 65355ba6c796d5b392daec44f3346e343347a369.