Revert e3d2a38..44a124e

This rolls back to commit e3d2a3866337fd30bcfbc2d96e4fcce6cb95b7bf.