Revert bf726c1