Reverted f96067e for now

Needs to be selectively applied.