Revert e0c59ae..a00859e

This rolls back to commit e0c59aeecca5eca2f65c8ad926add66cd5d157fa.