Revert e30cfa6..7b7e455

This rolls back to commit e30cfa67e513d22b8cf5b36cc6f0d71808c4bc6a.