Revert bug introduced in merge