Revert 9ad578f..fbaf314

This rolls back to commit 9ad578f3aeb0a53fd45fc7aa3b5802f7e020fd44.