Reverted in db139b4