Revert e54e360..250635b

This rolls back to commit e54e36076680fd4877b3db9de47bb75b37cb61d6.