Revert 8fb981a..d205d26

This rolls back to commit 8fb981ad3e04f61f75514d4e652c56cadd768109.