Reverted last change (22d66245ea - merge error message)